From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Fri, 18 Apr 2025 14:05:07 +0000 (+0200)
Subject: fix(rmdir): switch to another API for folder removal
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~10^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=710e5fac94af7217da4dea7df50ccc806d1488a7;p=nextcloud-desktop.git

fix(rmdir): switch to another API for folder removal

current QDir::rmdir API does not provide an error message when failing
to delete

retuse FileSystem::remove that may just works with folders

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index 52e8f11ad..55d4c3c8b 100644
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -304,7 +304,8 @@ bool FileSystem::removeRecursively(const QString &path, const std::function<void
         const auto parentFolderPath = fileInfo.dir().absolutePath();
         const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite};
         FileSystem::setFolderPermissions(path, FileSystem::FolderPermissions::ReadWrite);
-        allRemoved = QDir().rmdir(path);
+        auto folderDeleteError = QString{};
+        allRemoved = FileSystem::remove(path, &folderDeleteError);
         qCInfo(lcFileSystem()) << "delete" << path;
         if (allRemoved) {
             if (onDeleted)
@@ -317,7 +318,7 @@ bool FileSystem::removeRecursively(const QString &path, const std::function<void
             if (onError) {
                 onError(di.filePath(), false);
             }
-            qCWarning(lcFileSystem) << "Error removing folder" << path;
+            qCWarning(lcFileSystem) << "Error removing folder" << path << folderDeleteError;
         }
     }
     return allRemoved;